Remove conflict markers

diff --git a/ChangeLog b/ChangeLog
index d98c6409a9e8bfdd3ba2d0a4e8b52a655a0b636c..96f6127e6fe928dfcbd002c8671fb9acc9f81076 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,7 +105,6 @@ Tue Mar  2 17:55:31 2004  Matthias Clasen  <maclas@gmx.de>
        (gtk_file_chooser_default_get_resizable_hints): Test the
        resize_horizontally pointer, not the deferenced pointer.
 
->>>>>>> 1.5102
 2004-03-01  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): New

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d98c6409a9e8bfdd3ba2d0a4e8b52a655a0b636c..96f6127e6fe928dfcbd002c8671fb9acc9f81076 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -105,7 +105,6 @@ Tue Mar  2 17:55:31 2004  Matthias Clasen  <maclas@gmx.de>
        (gtk_file_chooser_default_get_resizable_hints): Test the
        resize_horizontally pointer, not the deferenced pointer.
 
->>>>>>> 1.5102
 2004-03-01  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): New

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d98c6409a9e8bfdd3ba2d0a4e8b52a655a0b636c..96f6127e6fe928dfcbd002c8671fb9acc9f81076 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -105,7 +105,6 @@ Tue Mar  2 17:55:31 2004  Matthias Clasen  <maclas@gmx.de>
        (gtk_file_chooser_default_get_resizable_hints): Test the
        resize_horizontally pointer, not the deferenced pointer.
 
->>>>>>> 1.5102
 2004-03-01  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): New

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d98c6409a9e8bfdd3ba2d0a4e8b52a655a0b636c..96f6127e6fe928dfcbd002c8671fb9acc9f81076 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -105,7 +105,6 @@ Tue Mar  2 17:55:31 2004  Matthias Clasen  <maclas@gmx.de>
        (gtk_file_chooser_default_get_resizable_hints): Test the
        resize_horizontally pointer, not the deferenced pointer.
 
->>>>>>> 1.5102
 2004-03-01  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): New

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d98c6409a9e8bfdd3ba2d0a4e8b52a655a0b636c..96f6127e6fe928dfcbd002c8671fb9acc9f81076 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -105,7 +105,6 @@ Tue Mar  2 17:55:31 2004  Matthias Clasen  <maclas@gmx.de>
        (gtk_file_chooser_default_get_resizable_hints): Test the
        resize_horizontally pointer, not the deferenced pointer.
 
->>>>>>> 1.5102
 2004-03-01  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): New